Refresh patches and drop one that's upstream

diff --git a/debian/changelog b/debian/changelog
index 3d955ff7f7cc795000adcce536acd93b1de63f37..6871041422935ca7f335cdced7da8aa61251f783 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,9 +4,11 @@ gnome-shell (50~beta-1) UNRELEASED; urgency=medium
   * Refresh patches and fix conflicts:
     - Revert-main-Register-session-with-GDM-on-startup.patch
     - Revert-tests-Fail-on-warnings-too.patch
+    - shell-app-Warn-instead-of-crashing-if-disposed-before-sta.patch
   * Drop upstreamed patches:
     - libgvc/* because 50.beta includes a new snapshot of the subproject
       which includes all those changes.
+    - Revert-main-Register-session-with-GDM-on-startup.patch
 
  -- Daniel van Vugt <daniel.van.vugt@canonical.com>  Wed, 04 Feb 2026 16:21:27 +0800
 

diff --git a/debian/patches/Revert-main-Register-session-with-GDM-on-startup.patch b/debian/patches/Revert-main-Register-session-with-GDM-on-startup.patch
deleted file mode 100644 (file)
index 2502fe7..0000000
--- a/debian/patches/Revert-main-Register-session-with-GDM-on-startup.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From: Joan Torres Lopez <joantolo@redhat.com>
-Date: Tue, 27 Jan 2026 13:33:36 +0100
-Subject: Revert "main: Register session with GDM on startup"
-
-This depends on GDM changes that are not in this release.
-
-This reverts commit 6457a1454a05bac8f7e172c17fbcb2b5baeae619.
-
-Origin: upstream, 49.4, commit:ba60daead6a54ec02ed5aa2841e72cd5acb591cb
-Bug: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/8983
-Bug: https://gitlab.gnome.org/GNOME/mutter/-/issues/4572
-Bug-Debian: https://bugs.debian.org/1125273
-Bug-Debian: https://bugs.debian.org/1125275
-Bug-Debian: https://bugs.debian.org/1125941
-Bug-Debian: https://bugs.debian.org/1126174
----
- js/ui/main.js | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/js/ui/main.js b/js/ui/main.js
-index 90e78a1..c911ab2 100644
---- a/js/ui/main.js
-+++ b/js/ui/main.js
-@@ -323,8 +323,6 @@ async function _initializeUI() {
-     extensionManager = new ExtensionSystem.ExtensionManager();
-     extensionManager.init();
- 
--    LoginManager.registerSessionWithGDM();
--
-     if (sessionMode.isGreeter && screenShield) {
-         layoutManager.connect('startup-prepared', () => {
-             screenShield.showDialog();
-@@ -371,6 +369,8 @@ async function _initializeUI() {
-             sessionMode.currentMode !== 'initial-setup')
-             _handleLockScreenWarning();
- 
-+        LoginManager.registerSessionWithGDM();
-+
-         if (perfModule) {
-             const perfOutput = GLib.getenv('SHELL_PERF_OUTPUT');
-             Scripting.runPerfScript(perfModule, perfOutput);

diff --git a/debian/patches/series b/debian/patches/series
index 12f356c3504f94c16566291932fddc3f2f56443f..8c91da106f1ea1bc45c5b4894d02a5abc06ba7d4 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-Revert-main-Register-session-with-GDM-on-startup.patch
 shell-app-Warn-instead-of-crashing-if-disposed-before-sta.patch
 debian/Revert-tests-Fail-on-warnings-too.patch
 debian/data-Add-im-config.desktop-to-System-folder.patch

diff --git a/debian/patches/shell-app-Warn-instead-of-crashing-if-disposed-before-sta.patch b/debian/patches/shell-app-Warn-instead-of-crashing-if-disposed-before-sta.patch
index 1a238c3498efe5182443093c981fed054f035d6e..e52e44fde0388c8be444f0b9d89fa547e119dbdc 100644 (file)
--- a/debian/patches/shell-app-Warn-instead-of-crashing-if-disposed-before-sta.patch
+++ b/debian/patches/shell-app-Warn-instead-of-crashing-if-disposed-before-sta.patch
@@ -19,10 +19,10 @@ Forwarded: https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3457
  1 file changed, 21 insertions(+), 3 deletions(-)
 
 diff --git a/src/shell-app.c b/src/shell-app.c
-index 916783a..c7630d2 100644
+index 84b75be..95792eb 100644
 --- a/src/shell-app.c
 +++ b/src/shell-app.c
-@@ -1736,14 +1736,32 @@ shell_app_dispose (GObject *object)
+@@ -1767,14 +1767,32 @@ shell_app_dispose (GObject *object)
  {
    ShellApp *app = SHELL_APP (object);